Fix mariadb version parsing #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ukablan-wpc
reviewed
Dec 26, 2024
| @@ -17,6 +17,12 @@ def test_parse_utility_output(self): | |||
| self.assertEqual(php.minor, 6) | |||
| self.assertEqual(php.patch, 12) | |||
|
|
|||
| def test_parse_utility_output_no_distrib(self): | |||
| php = mariadb.MariaDBVersion("mariadb from 11.6.2-MariaDB, client 15.2 for Linux (x86_64) using EditLine wrapper") | |||
There was a problem hiding this comment.
naming vers or mariadb?
ukablan-wpc
reviewed
Dec 26, 2024
pleskdistup/common/src/mariadb.py
Outdated
| @@ -56,6 +56,13 @@ def _extract_from_mysql_util(self, util_output: str): | |||
| self.minor = int(minor_part) | |||
| self.patch = int(patch_part) | |||
|
|
|||
| def _extract_from_mariadb_util(self, util_output: str): | |||
| # String example: "mariadb from 11.6.2-MariaDB, client 15.2 for Linux (x86_64) using EditLine wrapper" | |||
| major_part, minor_part, patch_part = util_output.split("from ")[1].split("-MariaDB")[0].split(".")[:3] | |||
There was a problem hiding this comment.
Would it be more robust if we try to find the version with a regexp or maybe find first dot then track back the numbers...?
ukablan-wpc
reviewed
Jan 3, 2025
ukablan-wpc
approved these changes
Jan 6, 2025
SandakovMM
force-pushed
the
fix-mariadb-version-parsing
branch
from
cda810c to
4f355d7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.